Skip to content

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Oct 4, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2020
@lcnr lcnr changed the title cleanup WithOptConstParam queries add shims for WithOptConstParam query calls Oct 4, 2020
Copy link
Contributor

@ecstatic-morse ecstatic-morse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my question about suffixes is resolved

In my perfect world, we would encode the unknown variant of WithOptConstArg as a type-state, so you would go from UnknownConstArg(DefId) to KnownConstArg(DefId, Option<DefId>) at some point (maybe with a name change as well). I don't know how ergonomic this would be, however. Adding an Unknown variant to WithOptConstArg might be a good middle ground as eddyb mentioned on Zulip.

@@ -440,4 +448,28 @@ impl<'tcx> TyCtxt<'tcx> {
self.promoted_mir(def.did)
}
}

#[inline]
pub fn optimized_mir_of_opt_const_arg(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these are suffixed with of_opt_const_arg while some have opt_const_arg. Does this denote different semantics? If not, can we use the same suffix for everything?

Copy link
Contributor Author

@lcnr lcnr Oct 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed of for all of them

@lcnr
Copy link
Contributor Author

lcnr commented Oct 12, 2020

I guess

@bors r=ecstatic-morse

@bors
Copy link
Collaborator

bors commented Oct 12, 2020

📌 Commit 8160bfa has been approved by ecstatic-morse

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 12, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Oct 12, 2020

@bors rollup

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 12, 2020
…atic-morse

add shims for WithOptConstParam query calls

r? @ecstatic-morse @eddyb
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 12, 2020
…atic-morse

add shims for WithOptConstParam query calls

r? @ecstatic-morse @eddyb
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#77550 (add shims for WithOptConstParam query calls)
 - rust-lang#77699 (Add word wrap for short descriptions)
 - rust-lang#77724 (Implement `AsRawFd` for `StdinLock` etc. on WASI.)
 - rust-lang#77746 (Fix `x.py setup` sets `changelog-seen`)
 - rust-lang#77784 (Fix intra-docs link in core::ffi::VaList)
 - rust-lang#77811 (rustdoc: Make some functions private that don't need to be public)
 - rust-lang#77818 (Mono collector: replace pair of ints with Range)
 - rust-lang#77831 (Use std methods on char instead of open coding them)
 - rust-lang#77852 (update url in bootstrap README (gcc-rs -> cc-rs))
 - rust-lang#77863 (Remove `mark-i-m` from rustc-dev-guide maintainers)

Failed merges:

r? `@ghost`
@bors bors merged commit 687d764 into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants